Revert the GtkSettings::gtk-toolbar-icon-size part of the previous change,

2008-10-11  Matthias Clasen  <mclasen@redhat.com>

        * gtk/gtktoolbar.c: Revert the GtkSettings::gtk-toolbar-icon-size
        part of the previous change, since it doesn't work correctly without
        extra complication, and using custom icon sizes doesn't make too
        much sense in a desktop-wide setting.

svn path=/trunk/; revision=21633

diff --git a/ChangeLog b/ChangeLog
index 5743a38837a6b8585ec4581c63f8833eff2b8c45..a34d4a27b6e2b9cf8c16783fb048fde6566ed9db 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-10-11  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtktoolbar.c: Revert the GtkSettings::gtk-toolbar-icon-size
+       part of the previous change, since it doesn't work correctly without
+       extra complication, and using custom icon sizes doesn't make too
+       much sense in a desktop-wide setting.
+
 2008-10-11  Matthias Clasen  <mclasen@redhat.com>
 
        Bug 555186 – Setting gtk-toolbar-icon-size with custom icon_size

diff --git a/gtk/gtktoolbar.c b/gtk/gtktoolbar.c
index ad046e33317b8267d3e8f1c24bc1b7a72f8d95c4..5844e47a611ee6a2616c905933c35a5692686c43 100644 (file)
--- a/gtk/gtktoolbar.c
+++ b/gtk/gtktoolbar.c
@@ -640,12 +640,12 @@ gtk_toolbar_class_init (GtkToolbarClass *klass)
                                                     DEFAULT_TOOLBAR_STYLE,
                                                     GTK_PARAM_READWRITE));
   
-  gtk_settings_install_property (g_param_spec_int ("gtk-toolbar-icon-size",
-                                                   P_("Toolbar icon size"),
-                                                   P_("Size of icons in default toolbars"),
-                                                   0, G_MAXINT,
-                                                   DEFAULT_ICON_SIZE,
-                                                   GTK_PARAM_READWRITE));  
+  gtk_settings_install_property (g_param_spec_enum ("gtk-toolbar-icon-size",
+                                                    P_("Toolbar icon size"),
+                                                    P_("Size of icons in default toolbars"),
+                                                    GTK_TYPE_ICON_SIZE,
+                                                    DEFAULT_ICON_SIZE,
+                                                    GTK_PARAM_READWRITE));  
 
   binding_set = gtk_binding_set_by_class (klass);